merge r21213
authorJo-Philipp Wich <[email protected]>
Tue, 27 Apr 2010 22:22:10 +0000 (22:22 +0000)
committerJo-Philipp Wich <[email protected]>
Tue, 27 Apr 2010 22:22:10 +0000 (22:22 +0000)
commitbc7fff59f1e1b04e12611645bba07092b14a24cd
treedfb9c4de6dc304ec0c52ea9ea13722dc98c86113
parent0b76c0f1444d9f7e1479646f3522a9d3060c52c6
merge r21213

SVN-Revision: 21214
target/imagebuilder/Makefile
target/imagebuilder/files/Makefile